meson: Require gtkmarshal_h before we build gtk
authorTimm Bäder <mail@baedert.org>
Tue, 20 Sep 2016 15:02:12 +0000 (17:02 +0200)
committerEmmanuele Bassi <ebassi@gnome.org>
Wed, 3 May 2017 14:10:51 +0000 (15:10 +0100)
gdk/meson.build
gtk/meson.build

index dd9baec3e9b5cacfd2a0e42a6c47bd015e94f663..25c56c9c8e486a40478434b9a78a9194c1a35dd9 100644 (file)
@@ -364,8 +364,7 @@ endif
 
 
 libgdk = shared_library('gdk',
-  gdk_sources,
-  gdkenum_h,
+  sources: [gdk_sources, gdkconfig, gdkenum_h],
   c_args: ['-DHAVE_CONFIG_H', '-DGDK_COMPILATION'],
   include_directories: [confinc, xinc, wlinc],
   dependencies: gdk_deps,
index f2c6379eb11b5e8058f492304ee1094ff28c52f4..c5acb5f622c28822b600bfaaea0793e6292f978a 100644 (file)
@@ -819,6 +819,7 @@ endif
 
 libgtk = shared_library('gtk',
   gtk_sources,
+  gtkmarshal_h,
   c_args: [
     '-DGTK_COMPILATION', '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
     '-DGTK_BINARY_VERSION="3"', '-DGTK_HOST="bob"',
@@ -839,6 +840,6 @@ libgtk_dep = declare_dependency(
     gtktypebuiltins_h,
   ],
   dependencies: gtk_deps,
-  link_with: libgtk,
+  link_with: [libgtk, libgdk],
   include_directories: [confinc, gtkinc]
 )